WIP 12.01.2014

Some clean-up here and there