fixed smaller things and client starter