oi vey so many bug fixes