Fixed bugs and added currency addition ability