Fixed several lines that lead poorly and issue with remove