indentations parsing improved, if-else section parsing improved