add stringizer
new naming convention
minor fixes