remove underscore
fix small bugs - copy pasta errors