stash old changes
merged remote branch master. Cleanedup some debug stuff.