updated various method to match comments
Merge branch 'button_style' of https://github.com/shoes/shoes4 into button_style