General improvements and moving forward