Serveral fixes & feature updates