faster, cleaner output
remove unused deps
fixes and tweaks