Updated framework, fixed broken code