Fixed a few details