added more things, ready for submission