Fixed some first time use issues.