Fixed issues with degree and other improvements.