Added Makefile pattern matching and other cleanup
Fixed string handling
Cleaned up constructors