started some polishing and testing

(WIP)