Fixes and optimizes to MistController