More improvements. merged with seb. ITS BLIIIIIS