major updates, & bug fixes