minor template changes
updated readme, todo
added tests for files, some minor issues
updated readme