Hud added, some bug fixes