Fixed bugs, working on titanic