declaring static functions where they were being called
fixing php standards messages
editing loader
Merge commit '193aec0'