bug fixes & money format