code issue fixes...