Added Tip Percentage and some bug fixes