changed limit to count, implemented basic timestamp / timezone calculation