Minor Update

Small clean-ups and bug fixes