fix basic things