Change to "markDirty" in comments / logging
Fix build.gradle
Fix some small stuff