fixed some initial issues.