Escape from the 70's: Second update

several bugs fixed improved management