fixed minore issues