Adding some minor changes, will do more tomorrow