fixed some issues

forgot to change branches tho :(