Cleaned up some problems