FS# 993, 1220, 1237 & some bugs fix