fixed schema and some extra stuff