cleaned up a bit, fixed fade