Cleaned up dones - other fixes