Updating Plan Table
Misc Changes