fixed basic issues