Fixed issues
-might make this better if i dont feel lazy