Added some content, fixed some bugs and build