Some more standards. Fixed nicer element selection
Fixed some bugs