Fixed some things based on feedback