fixes, removed invalid/unneeded things