Fixed naming conventions, added level inheretence, catches, speech