cleaning up / adding todo's