Adding/tweaking various things.
Merge branch 'master' of https://github.com/levisl176/jackieandlevi