Adding more features to 4.2 and cleaning up future errors