attribute overlay added
bug fixes, refactoring