Added human, modified salamander and collision detection