Annoying debug message fixed + small stuff