Debugged more errors