fixes, now seems functional