Implement AtExpression & misc fixes