initial commit - fixes