Fixed issues with incomplete calls, cleaned some code up.