Slight update with fixes