Merge "Add debug and some cleanup"