fixed invalid ref, more updates

Added inheritance from Class to add its static methods