removed some bugs/confusing things