fixed a couple remaining issues, seems to work