fixed time stamps and added data collector to main app