cleaning up, and fixing some magical error's, still one to go