fixed issues with premature ending on commands and shit