major rewrite
cleanup
added short_id to polls