Added and fixed some stuff up. Bump!