clean up and include erc stuff, FINALLY :D