done minus some small things