comments and tidying up
more comments
merged