Add features and tidy up