Update 0019

Some major fixes