Haven;t commit in a long time, minor changes