fix basic problems