Update with Amazon internship and some tweaks