Fixed some bugs so it should work correctly now when you test