Few small changes
Figure out that remaining bastard