fixed some initial problems