Commented, and finished magic stuff

- for parser and controller