improve everything so that its not entirely terrible