Fixed up some issues, cleaned up some dependencies