Fixed and combined the commits, thanks.