font fixes
indentation fixes and features