cleanup & new additions