optimise form sizes and made some todos