still fixing complie errors

Fixing more bugs