remove trash
general adjustements
improvements