more clean up -- NOW fully working and cleaned.