fixed some initial implementation issues