Cleaning up dependencies and improving parsing; adding categories.