cleanup, bug fix and testing