Last  changes done before demo. Game works but is not pretty right now