Fixed some intention issues