Updated with some real info, cleaned up a few things