Commit 1.29

Cleaning up and fixing code