Added new issues, fixed some errors