cleaned up warnings & tasks