haven't committed in too long. improved many things