fix ALOT of bugs
test them all
little mistacke fix