updated some things and tidied up some things, getting a feel for whats left to finish