Playing around with features and fixing some minor bugs