fixed some moments, expanded tabs to spaces