improved various stuff
collection stuff to improve