remove lots of method call overhead
make some concatenations easier to read
improve whitespace control
release 1.001