fixes for initial prototype