removed partial
added better errors - that shit cray!