Debugged some stuff
Static-ized some stuff