Updated markup
Fixing SQL errors and creating scripts, needs a lot of testing