final changes - bug fixes