Misc changes and new additions