Cleaned up, added stuff