end of night commit. several bugs fixed, everything working more stably