Mild update

- Fixed quickly-found bugs along with slight revision