Refactored staion limit, other clean up