fixed silly things, now compiles