touch ups and bug fixes