Dictionary module keeps the main file clean
Bug fixes, command framework