code cleanup
fix error handling
sending userID to tracking service