switched to using constants, fixed errors and added resources
merging