Addressed some errors and fixmes.