* fix typo * refactor display/surface * Merge branch 'master' into dev * add boundary check for fill_rect * Merge branch 'master' into dev * Merge branch 'master' into dev * refactor wnd.cpp * rename some variables