found some bug solutions - look at todo