Moved to new AWS instance. Fixed some bugs. Cleaned out v2 stuff