Changes to bomb timer and cleaned up code

Bomb time now dependent on how long you hold it