New additions & some tweaks