Add some mor comments...remove _functionnames