inlined ids as they where somewhat inlined anyways
minor style changes
0.4.1 - profiled and optimized