Some fixes & additions