Dictionary, working methods, bugs fixed