some final touches. basically done