Lots of misc little changes, went over every remaining TODO .. commented out dead code etc