fixed some small issues with hardcoded values