Added more quotes and improved random functionality