General updates, pushed to Version 2