bug fixes related to aliasing, parsing and daiquiri integration