app changes and dBug addition
general cleanup
test