MySQL DB script and few other small changes