'fix' some stuff, hate me later.