xml is a bitch

fixed around some views and updated some commenting