Your high idle is probably because the wax idle up valve in the throttle body is rooted, either that or you don't have water lines connected to it.
Common problem on all 16v's.