0.4.8, optimizations/ edits