fixing some Promise/A+ issues