Some comments + fixes