Use latest version of gradle plugin
Bump up comment bottom margin
Fix step offset bug; use adapters step offset