attempted to fix some issues with inner classes