Removed broken library refs and fixed comments