Fixed some embarrassing bugs :()