Stuff that urs just quickly fixed
Merge branch 'master' of github.com:urhokekkonen/h--y-aie
More parameter tweaking, timeline stuff and general finalization