fixing stuff... hopefully