Removed some left-over, added a few comments