Fix silly bugs
attempting a merge. Nothing blow up, please