incorporate better-defaults
add java indentation stuff