Added loopdock parts, some cleanup