Even more polishing plus removing some dirty hacks