Train size adjusted and puzzle elements added