fixed bug, added commas, and added new methods for next phase