Code

Some Fixmes solved