minor changes - bugs fixes