Some minor changes
last push for aws deployment