Added first round of issues
added the rest of the issues, fixed bugs and removed unused fields