Improvements and added commands.