Added more functionality, comments, readme info