Move stuff around
Minor improvements