added bibliography and all