Added functionality for a couple specials. Some bugs removed.