Massive code improvments (it was really ba before, now probably somewhat passible...)