fixed some issues based on feedback