all bugs fixed, commented out the triangle in Remco's code.