Most remaining definitions added, several matches improved and various bugs fixed