Some fixes & updates [ready for staging]