working on fixing stuff...