Some fixes and a couple more additions