FIX: fixed some typos and minor bugs