A lot of work on polishing

Still a few bgs, bt working on them.