fixed some bugs and future courses works