Finished the Q&A

Also fixed some bugs