Added issues, fixed some mistakes