Button numbers changed, comments added