Omeed bug fixes

Making sure things are working properly