[#4][feature] Some fixes.