Updated structure/bug fixes