Fixed bugs, added metadata