indent fix and other tweaks