Couple of bug fixes and new features