More work on the scenery and game mechanics