Cleaned up documentation, added timer