reported issues as comment, improved performance