fixes for initial prototype

fixes for initial prototype