Added modal, bug fixes.