Updated API, added map timer, and fixed returns.