Lot of little fix - v0.5.0