Feature/fixes

@apyousef Please review