Compatiblity tested and minor issues fixed.