Some initial improvements