Added lifebar, collision detection improved