Fix bugs after a bit of play testing
Move configuration to an ini file