General tidy up plus mass start by control

Closes #19, #18, #13, #12 and #11