some updates & cleaning