As always, small changes and bug fixes