angular adjustments and few fixes