last bugs fixed for missing classes