Minor fixes. Made changes as james commanded