final touches (for now)