+some uniform related improvements