various changes as of 2:37 on 6.11.14