Fixed some issues and cleared up exceptions