Fixes & minor additions