Fixed bugs and added overloaded methods.