Debug, optimize and update README