improve command line argument handling and remove android heartbeat