changed some stuff with status display
Updated class structure