Some additional features and fixes