Fixed some errors, resolved TODO and starting block structure