Table create and some fixes