refactored: fixed some small typos/bugs