moved stuff around and fixed annoying bugs in my setup