Added crepuscular extract, small bug fixes