fixed some todos and added something to futureworks