Fixes Minor bugs and updates vague references