fixed type sizes and removed harp-bourbon
merging