Fixed and updated some classes