final commit, everything in

everything is ready and playable. Minor tweaks might needed here and
there