working again after bugs and break