Removed most hardcoding

altered engine, background
might include some eetu changes