Minor updates + Bug fixes