Bugfixes, added .. detection