General updates, with bug fixes and full instructions