minor changes
many things..