Update

Updated a few class files