fixed bug; adjusted some stuff