cleaned some stuff up, fixed that one ubo bug