fixed buggs
more fixes, still erroring