Fixing bunch of things a making little modular.