some smaller updates to classes and PHP codes