fixed some lingering errors