Edge fixes

just to get you started, I will be pushing more to this branch :)