Updated a few bug fixes as per discussion w/ bpross