Kollison fixed, + minor fixes