better debugging and classes