issues fixed. almost