fixed additional errors