cleaned up mistakes to resolve compile errors