Bug fixes, status command tested