Still small bug, small updates