bugfixes, code standardization
bugfixes, code standardization