Added status, minor fixes, garbage cleaned