some fixes
Added more usecases