Fixed issues with size, started fixing issues with name