further fixes, lol?