fixing bugs and adjusting logic...testing to deploy now