cleaned up the project a little, more php friendly