gradle build fixed
style changed; misc.