fixingin some bugs; camera broken for now