Delete, and refresh solved... + some minor bugs fixes