Bug fixes + added max length to shaft detection