Minor improvements and initial specs