Indentation update and other features and bug fixes