switching to relative imports, plus other minor improvements based on review.