Mainly bitmap improvements