Polish, consolidate and fix bugs.