Fixed up a few bugs. Still a way to go with functionality
Bugs in automake