fixed a lot of stuff that should have worked before...