Code

fixed some hierarchy issues.