Moving some things around

Signed-off-by: Suki <suki@missallsunday.com>
The order of dependencies is important

Signed-off-by: Suki <suki@missallsunday.com>
Use $globals damn it!

Signed-off-by: Suki <suki@missallsunday.com>
Use $globals damn it!

Signed-off-by: Suki <suki@missallsunday.com>
ugly fixes for ugly bugs

Signed-off-by: Suki <suki@missallsunday.com>