Adding trader & craft tables, improving session