annoying stuff fixed