NCrunch support added + fixes for very minor issues I encountered during code study