few nice changes
redone fields and mb classes