Add debug and some cleanup

Change-Id: I866676a1ec4a338dcfe089cbf0483e5e546ded85
9 files changed