trying to close up some minor issues.
WIP but moving dev to a different server.