Fixed recurring events!!!!!!! + cleannup