start working on better throttling
Fixed some bugs
Added public