especially that last one! all others are temporary fixes