Changed main to starter, few minor changes.