Logic fixes, future promises