bug fixes, performance improvements, prettyification