Cleaned a bit code; added more DEBUG messages