Fixed noob mistakes