Issue 112

Finished up all that won't be touched much in the next releases.