Draft -03

- Minor fixes
- Factored out p variable