bug fixing
further fixings
merging