Type fixes (mostly method things)
Fixed the method call rule
Added method prototypes