finished proxy
minor stuff